treeview, iconview: Don't return the drop target

Not a good idea to hand internal event controllers out to public API.

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 076ca4dfbb3ba3800f967072d90b3d7fcf1040b2..9400fdd24b18af94e0c2969fe5c4f5a30b9b9bf4 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -6397,17 +6397,16 @@ gtk_icon_view_enable_model_drag_source (GtkIconView              *icon_view,
  *
  * Turns @icon_view into a drop destination for automatic DND. Calling this
  * method sets #GtkIconView:reorderable to %FALSE.
- *
- * Returns: (transfer none): the drop target that was attached
  **/
-GtkDropTarget *
+void
 gtk_icon_view_enable_model_drag_dest (GtkIconView       *icon_view,
                                       GdkContentFormats *formats,
                                      GdkDragAction      actions)
 {
-  g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
   GtkCssNode *widget_node;
 
+  g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
+
   icon_view->priv->dest = gtk_drop_target_new (gdk_content_formats_ref (formats), actions);
   g_signal_connect (icon_view->priv->dest, "drag-leave", G_CALLBACK (gtk_icon_view_drag_leave), icon_view);
   g_signal_connect (icon_view->priv->dest, "drag-motion", G_CALLBACK (gtk_icon_view_drag_motion), icon_view);
@@ -6426,8 +6425,6 @@ gtk_icon_view_enable_model_drag_dest (GtkIconView       *icon_view,
   gtk_css_node_set_parent (icon_view->priv->dndnode, widget_node);
   gtk_css_node_set_state (icon_view->priv->dndnode, gtk_css_node_get_state (widget_node));
   g_object_unref (icon_view->priv->dndnode);
-
-  return icon_view->priv->dest;
 }
 
 /**

diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index ffde51b90ace77650b7bfda371ce44b605b0a5a2..51e1a8be4dbd2e0047c28a3aaf50141c54cec00e 100644 (file)
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -27,8 +27,6 @@
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtkcellarea.h>
 #include <gtk/gtktooltip.h>
-#include <gtk/gtkdragsource.h>
-#include <gtk/gtkdragdest.h>
 
 G_BEGIN_DECLS
 
@@ -219,7 +217,7 @@ void                   gtk_icon_view_enable_model_drag_source (GtkIconView
                                                               GdkContentFormats        *formats,
                                                               GdkDragAction             actions);
 GDK_AVAILABLE_IN_ALL
-GtkDropTarget *        gtk_icon_view_enable_model_drag_dest   (GtkIconView              *icon_view,
+void                   gtk_icon_view_enable_model_drag_dest   (GtkIconView              *icon_view,
                                                               GdkContentFormats        *formats,
                                                               GdkDragAction             actions);
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkiconviewprivate.h b/gtk/gtkiconviewprivate.h
index 97ceed2986d3d7cca476aeb02b0b9402c2bc23c2..c45c3ba3e90a6742ee4da98d019f95568c37968a 100644 (file)
--- a/gtk/gtkiconviewprivate.h
+++ b/gtk/gtkiconviewprivate.h
@@ -17,6 +17,7 @@
 
 #include "gtk/gtkiconview.h"
 #include "gtk/gtkcssnodeprivate.h"
+#include "gtk/gtkdragdest.h"
 #include "gtk/gtkgestureclick.h"
 #include "gtk/gtkeventcontrollermotion.h"
 #include "gtk/gtkdragsource.h"

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8c41725d753b4cf3ec0cc844397aa26bf85e5e58..e56c489d9b1b3b7a1b0f79c1562a5bee91617e7a 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12855,10 +12855,8 @@ gtk_tree_view_enable_model_drag_source (GtkTreeView       *tree_view,
  * 
  * Turns @tree_view into a drop destination for automatic DND. Calling
  * this method sets #GtkTreeView:reorderable to %FALSE.
- *
- * Returns: (transfer none): the drop target that has been attached
  **/
-GtkDropTarget *
+void
 gtk_tree_view_enable_model_drag_dest (GtkTreeView       *tree_view,
                                      GdkContentFormats *formats,
                                      GdkDragAction      actions)
@@ -12866,7 +12864,7 @@ gtk_tree_view_enable_model_drag_dest (GtkTreeView       *tree_view,
   TreeViewDragInfo *di;
   GtkCssNode *widget_node;
 
-  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   di = ensure_info (tree_view);
   di->dest_set = TRUE;
@@ -12886,8 +12884,6 @@ gtk_tree_view_enable_model_drag_dest (GtkTreeView       *tree_view,
   g_object_unref (di->cssnode);
 
   unset_reorderable (tree_view);
-
-  return di->dest;
 }
 
 /**

diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index d9d400034aea8f14b5b551d107b977cb751f42d7..f4df3fc0b3b13066e651b326dc641a3556ed2964 100644 (file)
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -26,8 +26,6 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeviewcolumn.h>
 #include <gtk/gtkentry.h>
-#include <gtk/gtkdragsource.h>
-#include <gtk/gtkdragdest.h>
 
 G_BEGIN_DECLS
 
@@ -320,7 +318,7 @@ void                   gtk_tree_view_enable_model_drag_source      (GtkTreeView
                                                                    GdkContentFormats         *formats,
                                                                    GdkDragAction              actions);
 GDK_AVAILABLE_IN_ALL
-GtkDropTarget *        gtk_tree_view_enable_model_drag_dest        (GtkTreeView               *tree_view,
+void                   gtk_tree_view_enable_model_drag_dest        (GtkTreeView               *tree_view,
                                                                    GdkContentFormats         *formats,
                                                                    GdkDragAction              actions);
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a9d8a104c08cc2fdc607b9452ddf3e5487b9cb7f..d5152fdecb18303e98968a71c8628e52903cd944 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -24,6 +24,7 @@
 #include "gtkcellareabox.h"
 #include "gtkcellareacontext.h"
 #include "gtkcelllayout.h"
+#include "gtkdragsource.h"
 #include "gtkframe.h"
 #include "gtkimage.h"
 #include "gtkintl.h"